From: emellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Date: Tue, 10 Jan 2006 14:38:22 +0000 (+0000)
Subject: Merged.
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~16548
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/success//%22http:/www.example.com/cgi/success/?a=commitdiff_plain;h=28f970eb4080c02a5df0b698d6e5fd9ea9af960a;p=xen.git

Merged.
---

28f970eb4080c02a5df0b698d6e5fd9ea9af960a
diff --cc tools/libxc/xc_linux_build.c
index 6a7a0369fc,8d119717f2..ed1cafc71b
--- a/tools/libxc/xc_linux_build.c
+++ b/tools/libxc/xc_linux_build.c
@@@ -693,11 -693,11 +693,12 @@@ static int setup_guest(int xc_handle
          start_info->mod_start    = vinitrd_start;
          start_info->mod_len      = initrd_len;
      }
 -    if ( cmdline != NULL )
 +    if (cmdline != NULL) {
+     {
          strncpy((char *)start_info->cmd_line, cmdline, MAX_GUEST_CMDLINE);
          start_info->cmd_line[MAX_GUEST_CMDLINE-1] = '\0';
 -    }
 +    } else
 +        start_info->cmd_line[0] = '\0';
      munmap(start_info, PAGE_SIZE);
  
      /* shared_info page starts its life empty. */